Auto merge of #1453 - alexcrichton:doc-assert, r=huonw
authorbors <bors@rust-lang.org>
Wed, 25 Mar 2015 23:31:37 +0000 (23:31 +0000)
committerbors <bors@rust-lang.org>
Wed, 25 Mar 2015 23:31:37 +0000 (23:31 +0000)
Closes #1454


Trivial merge